Merge "Require unlock for custom SMS dialog"