Merge "Preparation task for Settings Fragment Migration"