Merge "Prevent monkey from turning off the screen." into honeycomb