Merge "Revisions to Inline Controls for unblockable apps"