Merge "Updated some internal apps to use TYPE_APPLICATION_OVERLAY"