Merge "Fix bug #14323392 Old Settings screen is shown while choosing Settings shortcut"