Merge "Added TextController Relayouter class to handle relayouting" into devel/master