Merge "App ops: the draw on top op now actually controls what is drawn."