Merge "Propagate change Id1393cef to tablet UI." into jb-dev