Merge "Fix issue #5321282: Force Stop Button in Battery Screen Not disabled correctly"