Merge "Handle orientation change in FM app"