Merge "Fix bug 5341139 - bottom bar stays if app wants to handle orientation change"