Merge "DO NOT MERGE Do not update bar control target when application is starting" into rvc-qpr-dev