* commit '8a1131d78925756835561c3e19cddd2ddf9dbd99': DO NOT MERGE cherry-picked FU framework tablet commits