Merge "FP2-702[App_Settings]Low battery hint will not pops up" into fp2-dev-v2