Merge "Fix 5386408: Fix battery state information propagation in Lock Screen"