Merge "Fixing misc issues that leads to black screen when pressing Home" into...
Merge "Fixing misc issues that leads to black screen when pressing Home" into nyc-dev am: b20ecd6d
am: e6295003
* commit 'e6295003':
Fixing misc issues that leads to black screen when pressing Home