am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit '84b4791aaf0384a334068a97c70fcda162cfadab':
  Modified lollipop Easter egg for TV compatibility