Merge "Fixup App Compaction CL nits." into qt-dev