Merge "Add system wide long-press back button functionality" into nyc-dev