Merge "Fix locked profile activity hiding logic" into udc-dev