Merge commit 'fe53d78858c4d853cb82394d44740769241f70bf' * commit 'fe53d78858c4d853cb82394d44740769241f70bf': More battery level improvements.
Merge commit 'fe53d78858c4d853cb82394d44740769241f70bf' * commit 'fe53d78858c4d853cb82394d44740769241f70bf': More battery level improvements.