Merge "Switch user when waking up from STR target user has changed"