[1/3] Base: Squashed commits for 4.4 active display