Merge "More app ops fg/bg tuning" into pi-dev