am 41298971: Merge "Fixing disappearing lock screen, issue 5319246" into ics-factoryrom

* commit '41298971c774a336257fff4a97ed5d5505bbfb60':
  Fixing disappearing lock screen, issue 5319246