Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1