Merge "Fixed race condition with different profiles" into qt-r1-dev am: 5faf43ad73
am: 4268e1b7b0

Change-Id: Iaa465b62d63f4152047b1f6e14899c96b8233a1f