Merge "DirectReply: fix lockscreen crash" into nyc-mr1-dev