Merge "Workaround a bug that causes multiple activity instances are created"