Merge "[ESR] Force esr-gui to run as non-root"