Merge "Fix mis-overridden of activity level unifying"