Merge "Do not allow draw on top for default sms picker."