Merge "Adjusted margins of Ongoing App Ops Dialog"