Merge "Fix focus flag on shade" into rvc-dev