Merge "Fixing misc issues that leads to black screen when pressing Home" into nyc-dev