Merge "Style changes to blocking helper for Q. Bug:123900539 Test: Manual testing on device and unit tests."