Merge "Pulled out part of onScreenTurnedOn() into show() function"