Merge "Move two target preference layout from settings to lib"