Merge commit '5cf07feb3df89e827324e1204674c4f3629eb27e' * commit '5cf07feb3df89e827324e1204674c4f3629eb27e': Fix 2146581: Make tabs work for donut apps
Merge commit '5cf07feb3df89e827324e1204674c4f3629eb27e' * commit '5cf07feb3df89e827324e1204674c4f3629eb27e': Fix 2146581: Make tabs work for donut apps