Merge "Added provision to switch the PageIndicator in specific Launchers" into tm-dev