Merge "Only show "reset app preference" actionbar menu in app info"