Merge "Skip updating system bar attributes while relaunching related apps" into tm-qpr-dev