Merge "Fix 3381322: Update transition animation from lockscreen to home." into honeycomb