Merge "Change includeMarginsInAlignment flag to aligmentMode property."