Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb