Merge "Prevent non-blockable app from being blocked"