Merge "Showing starting window after activity flags applied"