Merge "h/q/d: Consider dropped layers while calculating FB z-order"