Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev