Merge "Some fixes for black screen when pressing home button" into nyc-dev