Merge "Use screen timeout settings of current user." into main