Merge "Set dialog background activity start mode on U+"