Merge "Add setting to go to sleep after long user inactivity"