Merge "Dejank app switching." into nyc-dev