Merge "Fix show on lock for freeform mode properly"