NXP-11138: follow changes around content view buttons