Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread