Merge "Update the timeout list dialog in display and security settings." into nyc-dev