Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev