Merge "Fixing low battery dialog" into ics-factoryrom