Merge "Revert menu key updated functionality to avoid unnecessary IPCs" into main