Merge "Fix bug 4904520 - Swap force close/report buttons"