Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo