Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev