Merge commit '4.4.1_r1' into cr-4.4

Change-Id: I1f83f8173d06cb7623a7285396420a9e92f67b9b
Attempt to fix QS battery tile to work with SlimRoms custom battery

Change-Id: Ibb6f184a2c08285103bb7945b274c17d91b97a51