Merge "Fix the reappearing fake action bar when returning to the Activity"