Merge "Fix 5579440: Add transport control view to tablet unlock screens" into ics-mr1