Merge "Remove extra help & feedback menu from power usage" into mnc-dev