Merge "Removing use of deprecated constants in GridLayout."